+++ /dev/null
-From af96fb92052c307818eefa4b687f964f1e3f542e Mon Sep 17 00:00:00 2001
-Date: Thu, 12 Sep 2019 15:04:35 -0500
-Subject: [PATCH] notice read and write errors on input and output
-
-Quoting from the bug report:
- bc (1.06-19ubuntu1) dapper; urgency=low
- * Make dc notice read and write errors on its input and output.
- I grepped for mentions of the strings `putc', `print', `getc',
- `FILE', `stdin', `stdout' and `stderr' and added calls to new
- error-checking functions unless it was clear from the
- immediately-surrounding code that the program was exiting
- nonzero, or would exit nonzero if the call failed. I ignored
- hits in lib/getopt*, which seems to pervasively ignore write
- errors when printing usage messages, in the hope that these
- were correct. I _think_ I got them all. -iwj.
-
-Upsteam:
-https://sources.debian.org/patches/bc/1.07.1-2/05_notice_read_write_errors.diff/
-
-[Reformatted to GIT for 1.0.7.1 by Matt W]
-Origin: other
-Bug-Debian: http://bugs.debian.org/488735
-
-[Bernd:
- on 2024-03-13 that fix Debian bug https://bugs.debian.org/1065375]
----
- bc/execute.c | 10 +++++++++-
- bc/main.c | 3 +++
- bc/sbc.y | 2 ++
- bc/scan.c | 2 ++
- bc/scan.l | 3 +++
- bc/util.c | 15 ++++++++++++--
- dc/dc.c | 3 +++
- dc/eval.c | 55 +++++++++++++++++++++++++++++++++++++++-------------
- dc/misc.c | 1 +
- dc/numeric.c | 9 +++++++++
- dc/stack.c | 11 ++++++++++-
- dc/string.c | 2 ++
- h/number.h | 11 +++++++----
- lib/number.c | 24 +++++++++++++++++++++++
- 14 files changed, 129 insertions(+), 22 deletions(-)
-
---- a/bc/execute.c
-+++ b/bc/execute.c
-@@ -104,6 +104,7 @@ execute (void)
- }
- out_char ('\n');
- }
-+ checkferror_output(stdout);
- }
- #endif
-
-@@ -224,6 +225,7 @@ execute (void)
- }
- }
- fflush (stdout);
-+ checkferror_output(stdout);
- break;
-
- case 'R' : /* Return from function */
-@@ -259,6 +261,7 @@ execute (void)
- if (inst == 'W') out_char ('\n');
- store_var (4); /* Special variable "last". */
- fflush (stdout);
-+ checkferror_output(stdout);
- pop ();
- break;
-
-@@ -342,6 +345,7 @@ execute (void)
- case 'w' : /* Write a string to the output. */
- while ((ch = byte(&pc)) != '"') out_schar (ch);
- fflush (stdout);
-+ checkferror_output(stdout);
- break;
-
- case 'x' : /* Exchange Top of Stack with the one under the tos. */
-@@ -549,7 +553,10 @@ execute (void)
- {
- signal (SIGINT, use_quit);
- if (had_sigint)
-- printf ("\ninterrupted execution.\n");
-+ {
-+ printf ("\ninterrupted execution.\n");
-+ checkferror_output(stdout);
-+ }
- }
- }
-
-@@ -584,6 +591,7 @@ input_char (void)
- out_col = 0; /* Saw a new line */
- }
- }
-+ checkferror_input(stdin);
-
- /* Classify and preprocess the input character. */
- if (isdigit(in_ch))
---- a/bc/main.c
-+++ b/bc/main.c
-@@ -353,6 +353,9 @@ use_quit (int sig)
- errno = save;
- #else
- write (1, "\n(interrupt) Exiting bc.\n", 26);
-+#ifdef READLINE
-+ rl_initialize (); /* Clear readline buffer */
-+#endif
- bc_exit(0);
- #endif
- }
---- a/bc/sbc.y
-+++ b/bc/sbc.y
-@@ -86,7 +86,9 @@ program : /* empty */
- if (interactive && !quiet)
- {
- show_bc_version ();
-+ checkferror_output(stdout);
- welcome ();
-+ checkferror_output(stdout);
- }
- }
- | program input_item
---- a/bc/scan.c
-+++ b/bc/scan.c
-@@ -791,6 +791,7 @@ bcel_input (char *buf, yy_size_t *resul
- if (bcel_len != 0)
- history (hist, &histev, H_ENTER, bcel_line);
- fflush (stdout);
-+ checkferror_output(stdout);
- }
-
- if (bcel_len <= max)
-@@ -863,6 +864,7 @@ rl_input (char *buf, int *result, int ma
- add_history (rl_line);
- rl_line[rl_len-1] = '\n';
- fflush (stdout);
-+ checkferror_output(stdout);
- }
-
- if (rl_len <= max)
---- a/bc/scan.l
-+++ b/bc/scan.l
-@@ -99,6 +99,7 @@ bcel_input (char *buf, yy_size_t *resul
- if (bcel_len != 0)
- history (hist, &histev, H_ENTER, bcel_line);
- fflush (stdout);
-+ checkferror_output(stdout);
- }
-
- if (bcel_len <= max)
-@@ -171,6 +172,7 @@ rl_input (char *buf, int *result, int ma
- add_history (rl_line);
- rl_line[rl_len-1] = '\n';
- fflush (stdout);
-+ checkferror_output(stdout);
- }
-
- if (rl_len <= max)
-@@ -295,6 +297,7 @@ limits return(Limits);
- if (c == EOF)
- {
- fprintf (stderr,"EOF encountered in a comment.\n");
-+ checkferror_output(stderr);
- break;
- }
- }
---- a/bc/util.c
-+++ b/bc/util.c
-@@ -247,9 +247,10 @@ init_gen (void)
- continue_label = 0;
- next_label = 1;
- out_count = 2;
-- if (compile_only)
-+ if (compile_only) {
- printf ("@i");
-- else
-+ checkferror_output(stdout);
-+ } else
- init_load ();
- had_error = FALSE;
- did_gen = FALSE;
-@@ -272,6 +273,7 @@ generate (const char *str)
- printf ("\n");
- out_count = 0;
- }
-+ checkferror_output(stdout);
- }
- else
- load_code (str);
-@@ -289,6 +291,7 @@ run_code(void)
- if (compile_only)
- {
- printf ("@r\n");
-+ checkferror_output(stdout);
- out_count = 0;
- }
- else
-@@ -326,6 +329,7 @@ out_char (int ch)
- }
- putchar (ch);
- }
-+ checkferror_output(stdout);
- }
-
- /* Output routines: Write a character CH to the standard output.
-@@ -355,6 +359,7 @@ out_schar (int ch)
- }
- putchar (ch);
- }
-+ checkferror_output(stdout);
- }
-
-
-@@ -639,6 +644,7 @@ limits(void)
- #ifdef OLD_EQ_OP
- printf ("Old assignment operatiors are valid. (=-, =+, ...)\n");
- #endif
-+ checkferror_output(stdout);
- }
-
- /* bc_malloc will check the return value so all other places do not
-@@ -703,6 +709,7 @@ yyerror (str, va_alist)
- fprintf (stderr,"%s %d: ",name,line_no);
- vfprintf (stderr, str, args);
- fprintf (stderr, "\n");
-+ checkferror_output(stderr);
- had_error = TRUE;
- va_end (args);
- }
-@@ -743,6 +750,7 @@ ct_warn (mesg, va_alist)
- fprintf (stderr,"%s %d: Error: ",name,line_no);
- vfprintf (stderr, mesg, args);
- fprintf (stderr, "\n");
-+ checkferror_output(stderr);
- had_error = TRUE;
- }
- else
-@@ -755,6 +763,7 @@ ct_warn (mesg, va_alist)
- fprintf (stderr,"%s %d: (Warning) ",name,line_no);
- vfprintf (stderr, mesg, args);
- fprintf (stderr, "\n");
-+ checkferror_output(stderr);
- }
- va_end (args);
- }
-@@ -789,6 +798,7 @@ rt_error (mesg, va_alist)
- va_end (args);
-
- fprintf (stderr, "\n");
-+ checkferror_output(stderr);
- runtime_error = TRUE;
- }
-
-@@ -823,6 +833,7 @@ rt_warn (const char *mesg)
- va_end (args);
-
- fprintf (stderr, "\n");
-+ checkferror_output(stderr);
- }
-
- /* bc_exit: Make sure to reset the edit state. */
---- a/dc/dc.c
-+++ b/dc/dc.c
-@@ -45,6 +45,7 @@
- #include <getopt.h>
- #include "dc.h"
- #include "dc-proto.h"
-+#include "number.h"
-
- #ifndef EXIT_SUCCESS /* C89 <stdlib.h> */
- # define EXIT_SUCCESS 0
-@@ -59,6 +60,7 @@ static void
- bug_report_info DC_DECLVOID()
- {
-+ checkferror_output(stdout);
- }
-
- static void
-@@ -69,6 +71,7 @@ show_version DC_DECLVOID()
- This is free software; see the source for copying conditions. There is NO\n\
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,\n\
- to the extent permitted by law.\n", DC_COPYRIGHT);
-+ checkferror_output(stdout);
- }
-
- /* your generic usage function */
-@@ -85,6 +88,7 @@ Usage: %s [OPTION] [file ...]\n\
- \n\
- ", progname);
- bug_report_info();
-+ checkferror_output(f);
- }
-
- /* returns a pointer to one past the last occurance of c in s,
---- a/dc/eval.c
-+++ b/dc/eval.c
-@@ -41,6 +41,7 @@
- #endif
- #include "dc.h"
- #include "dc-proto.h"
-+#include "number.h"
-
- typedef enum {DC_FALSE, DC_TRUE} dc_boolean;
-
-@@ -97,12 +98,15 @@ static int input_pushback;
- static int
- input_fil DC_DECLVOID()
- {
-+ int c;
- if (input_pushback != EOF){
-- int c = input_pushback;
-+ c = input_pushback;
- input_pushback = EOF;
- return c;
- }
-- return getc(input_fil_fp);
-+ c = getc(input_fil_fp);
-+ checkferror_input(input_fil_fp);
-+ return c;
- }
-
- /* passed as an argument to dc_getnum */
-@@ -301,11 +305,13 @@ dc_func DC_DECLARG((c, peekc, negcmp))
- tmpint = dc_num2int(datum.v.number, DC_TOSS);
- if (2 <= tmpint && tmpint <= DC_IBASE_MAX)
- dc_ibase = tmpint;
-- else
-+ else {
- fprintf(stderr,
- "%s: input base must be a number \
- between 2 and %d (inclusive)\n",
- progname, DC_IBASE_MAX);
-+ checkferror_output(stderr);
-+ }
- }
- break;
- case 'k': /* set scale to value on top of stack */
-@@ -313,11 +319,12 @@ between 2 and %d (inclusive)\n",
- tmpint = -1;
- if (datum.dc_type == DC_NUMBER)
- tmpint = dc_num2int(datum.v.number, DC_TOSS);
-- if ( ! (tmpint >= 0) )
-+ if ( ! (tmpint >= 0) ) {
- fprintf(stderr,
- "%s: scale must be a nonnegative number\n",
- progname);
-- else
-+ checkferror_output(stderr);
-+ } else
- dc_scale = tmpint;
- }
- break;
-@@ -341,11 +348,12 @@ between 2 and %d (inclusive)\n",
- tmpint = 0;
- if (datum.dc_type == DC_NUMBER)
- tmpint = dc_num2int(datum.v.number, DC_TOSS);
-- if ( ! (tmpint > 1) )
-+ if ( ! (tmpint > 1) ) {
- fprintf(stderr,
- "%s: output base must be a number greater than 1\n",
- progname);
-- else
-+ checkferror_output(stderr);
-+ } else
- dc_obase = tmpint;
- }
- break;
-@@ -378,6 +386,7 @@ between 2 and %d (inclusive)\n",
- fprintf(stderr,
- "%s: square root of nonnumeric attempted\n",
- progname);
-+ checkferror_output(stderr);
- }else if (dc_sqrt(datum.v.number, dc_scale, &tmpnum) == DC_SUCCESS){
- dc_free_num(&datum.v.number);
- datum.v.number = tmpnum;
-@@ -424,6 +433,7 @@ between 2 and %d (inclusive)\n",
- dc_garbage("at top of stack", -1);
- }
- fflush(stdout);
-+ checkferror_output(stdout);
- break;
- case 'Q': /* quit out of top-of-stack nested evals;
- * pops value from stack;
-@@ -440,6 +450,7 @@ between 2 and %d (inclusive)\n",
- fprintf(stderr,
- "%s: Q command requires a number >= 1\n",
- progname);
-+ checkferror_output(stderr);
- }
- break;
- case 'R': /* pop a value off of the evaluation stack,;
-@@ -483,11 +494,12 @@ between 2 and %d (inclusive)\n",
- if (datum.dc_type == DC_NUMBER)
- tmpint = dc_num2int(datum.v.number, DC_TOSS);
- if (dc_pop(&datum) == DC_SUCCESS){
-- if (tmpint < 0)
-+ if (tmpint < 0) {
- fprintf(stderr,
- "%s: array index must be a nonnegative integer\n",
- progname);
-- else
-+ checkferror_output(stderr);
-+ } else
- dc_array_set(peekc, tmpint, datum);
- }
- }
-@@ -499,18 +511,21 @@ between 2 and %d (inclusive)\n",
- tmpint = -1;
- if (datum.dc_type == DC_NUMBER)
- tmpint = dc_num2int(datum.v.number, DC_TOSS);
-- if (tmpint < 0)
-+ if (tmpint < 0) {
- fprintf(stderr,
- "%s: array index must be a nonnegative integer\n",
- progname);
-- else
-+ checkferror_output(stderr);
-+ } else
- dc_push(dc_array_get(peekc, tmpint));
- }
- return DC_EATONE;
-
- default: /* What did that user mean? */
- fprintf(stderr, "%s: ", progname);
-+ checkferror_output(stderr);
- dc_show_id(stdout, c, " unimplemented\n");
-+ checkferror_output(stdout);
- break;
- }
- return DC_OKAY;
-@@ -538,6 +553,7 @@ evalstr DC_DECLARG((string))
- fprintf(stderr,
- "%s: eval called with non-string argument\n",
- progname);
-+ checkferror_output(stderr);
- return DC_OKAY;
- }
- interrupt_seen = 0;
-@@ -635,6 +651,7 @@ evalstr DC_DECLARG((string))
- return DC_FAIL;
- }
- fprintf(stderr, "%s: unexpected EOS\n", progname);
-+ checkferror_output(stderr);
- return DC_OKAY;
- }
- }
-@@ -692,6 +709,7 @@ dc_evalfile DC_DECLARG((fp))
- stdin_lookahead = EOF;
- for (c=getc(fp); c!=EOF; c=peekc){
- peekc = getc(fp);
-+ checkferror_input(stdin);
- /*
- * The following if() is the only place where ``stdin_lookahead''
- * might be set to other than EOF:
-@@ -717,24 +735,30 @@ dc_evalfile DC_DECLARG((fp))
- signal(SIGINT, sigint_handler);
- switch (dc_func(c, peekc, negcmp)){
- case DC_OKAY:
-- if (stdin_lookahead != peekc && fp == stdin)
-+ if (stdin_lookahead != peekc && fp == stdin) {
- peekc = getc(fp);
-+ checkferror_input(stdin);
-+ }
- break;
- case DC_EATONE:
- peekc = getc(fp);
-+ checkferror_input(fp);
- break;
- case DC_EVALREG:
- /*commands which send us here shall guarantee that peekc!=EOF*/
- c = peekc;
- peekc = getc(fp);
-+ checkferror_input(fp);
- stdin_lookahead = peekc;
- if (dc_register_get(c, &datum) != DC_SUCCESS)
- break;
- dc_push(datum);
- /*@fallthrough@*/
- case DC_EVALTOS:
-- if (stdin_lookahead != peekc && fp == stdin)
-+ if (stdin_lookahead != peekc && fp == stdin) {
- peekc = getc(fp);
-+ checkferror_input(stdin);
-+ }
- if (dc_pop(&datum) == DC_SUCCESS){
- if (datum.dc_type == DC_NUMBER){
- dc_push(datum);
-@@ -744,6 +768,7 @@ dc_evalfile DC_DECLARG((fp))
- goto reset_and_exit_quit;
- fprintf(stderr, "%s: Q command argument exceeded \
- string execution depth\n", progname);
-+ checkferror_output(stderr);
- }
- }else{
- dc_garbage("at top of stack", -1);
-@@ -756,8 +781,11 @@ string execution depth\n", progname);
- fprintf(stderr,
- "%s: Q command argument exceeded string execution depth\n",
- progname);
-- if (stdin_lookahead != peekc && fp == stdin)
-+ checkferror_output(stderr);
-+ if (stdin_lookahead != peekc && fp == stdin) {
- peekc = getc(fp);
-+ checkferror_input(stdin);
-+ }
- break;
-
- case DC_INT:
---- a/dc/misc.c
-+++ b/dc/misc.c
-@@ -47,6 +47,7 @@
- #include <getopt.h>
- #include "dc.h"
- #include "dc-proto.h"
-+#include "number.h"
-
- #ifndef EXIT_FAILURE /* C89 <stdlib.h> */
- # define EXIT_FAILURE 1
-@@ -89,6 +90,7 @@ dc_show_id DC_DECLARG((fp, id, suffix))
- fprintf(fp, "'%c' (%#o)%s", (unsigned int) id, id, suffix);
- else
- fprintf(fp, "%#o%s", (unsigned int) id, suffix);
-+ checkferror_output(fp);
- }
-
- \f
---- a/dc/numeric.c
-+++ b/dc/numeric.c
-@@ -133,6 +133,7 @@ dc_div DC_DECLARG((a, b, kscale, result)
- bc_init_num(CastNumPtr(result));
- if (bc_divide(CastNum(a), CastNum(b), CastNumPtr(result), kscale)){
- fprintf(stderr, "%s: divide by zero\n", progname);
-+ checkferror_output(stderr);
- return DC_DOMAIN_ERROR;
- }
- return DC_SUCCESS;
-@@ -155,6 +156,7 @@ dc_divrem DC_DECLARG((a, b, kscale, quot
- if (bc_divmod(CastNum(a), CastNum(b),
- CastNumPtr(quotient), CastNumPtr(remainder), kscale)){
- fprintf(stderr, "%s: divide by zero\n", progname);
-+ checkferror_output(stderr);
- return DC_DOMAIN_ERROR;
- }
- return DC_SUCCESS;
-@@ -173,6 +175,7 @@ dc_rem DC_DECLARG((a, b, kscale, result)
- bc_init_num(CastNumPtr(result));
- if (bc_modulo(CastNum(a), CastNum(b), CastNumPtr(result), kscale)){
- fprintf(stderr, "%s: remainder by zero\n", progname);
-+ checkferror_output(stderr);
- return DC_DOMAIN_ERROR;
- }
- return DC_SUCCESS;
-@@ -225,6 +228,7 @@ dc_sqrt DC_DECLARG((value, kscale, resul
- tmp = bc_copy_num(CastNum(value));
- if (!bc_sqrt(&tmp, kscale)){
- fprintf(stderr, "%s: square root of negative number\n", progname);
-+ checkferror_output(stderr);
- bc_free_num(&tmp);
- return DC_DOMAIN_ERROR;
- }
-@@ -470,6 +474,7 @@ dc_dump_num DC_DECLARG((dcvalue, discard
-
- for (cur=top_of_stack; cur; cur=next) {
- putchar(cur->digit);
-+ checkferror_output(stdout);
- next = cur->link;
- free(cur);
- }
-@@ -587,6 +592,8 @@ out_char (ch)
- out_col = 1;
- }
- putchar(ch);
-+ checkferror_output(stdout);
-+ checkferror_output(stderr);
- }
- }
-
-@@ -626,6 +633,7 @@ rt_error (mesg, va_alist)
- vfprintf (stderr, mesg, args);
- va_end (args);
- fprintf (stderr, "\n");
-+ checkferror_output(stderr);
- }
-
-
-@@ -659,6 +667,7 @@ rt_warn (mesg, va_alist)
- vfprintf (stderr, mesg, args);
- va_end (args);
- fprintf (stderr, "\n");
-+ checkferror_output(stderr);
- }
-
- \f
---- a/dc/stack.c
-+++ b/dc/stack.c
-@@ -33,9 +33,13 @@
- #include "dc.h"
- #include "dc-proto.h"
- #include "dc-regdef.h"
-+#include "number.h"
-
- /* an oft-used error message: */
--#define Empty_Stack fprintf(stderr, "%s: stack empty\n", progname)
-+#define Empty_Stack do{ \
-+ fprintf(stderr, "%s: stack empty\n", progname); \
-+ checkferror_output(stderr); \
-+ }while(0)
-
-
- /* simple linked-list implementation suffices: */
-@@ -91,6 +95,7 @@ dc_binop DC_DECLARG((op, kscale))
- if (dc_stack->value.dc_type!=DC_NUMBER
- || dc_stack->link->value.dc_type!=DC_NUMBER){
- fprintf(stderr, "%s: non-numeric value\n", progname);
-+ checkferror_output(stderr);
- return;
- }
- (void)dc_pop(&b);
-@@ -131,6 +136,7 @@ dc_binop2 DC_DECLARG((op, kscale))
- if (dc_stack->value.dc_type!=DC_NUMBER
- || dc_stack->link->value.dc_type!=DC_NUMBER){
- fprintf(stderr, "%s: non-numeric value\n", progname);
-+ checkferror_output(stderr);
- return;
- }
- (void)dc_pop(&b);
-@@ -169,6 +175,7 @@ dc_cmpop DC_DECLVOID()
- if (dc_stack->value.dc_type!=DC_NUMBER
- || dc_stack->link->value.dc_type!=DC_NUMBER){
- fprintf(stderr, "%s: non-numeric value\n", progname);
-+ checkferror_output(stderr);
- return 0;
- }
- (void)dc_pop(&b);
-@@ -206,6 +213,7 @@ dc_triop DC_DECLARG((op, kscale))
- || dc_stack->link->value.dc_type!=DC_NUMBER
- || dc_stack->link->link->value.dc_type!=DC_NUMBER){
- fprintf(stderr, "%s: non-numeric value\n", progname);
-+ checkferror_output(stderr);
- return;
- }
- (void)dc_pop(&c);
-@@ -327,6 +335,7 @@ dc_register_get DC_DECLARG((regid, resul
- *result = dc_int2data(0);
- }else if (r->value.dc_type==DC_UNINITIALIZED){
- fprintf(stderr, "%s: BUG: register ", progname);
-+ checkferror_output(stderr);
- dc_show_id(stderr, regid, " exists but is uninitialized?\n");
- return DC_FAIL;
- }else{
-@@ -402,6 +411,7 @@ dc_register_pop DC_DECLARG((stackid, res
- r = dc_register[stackid];
- if (r==NULL || r->value.dc_type==DC_UNINITIALIZED){
- fprintf(stderr, "%s: stack register ", progname);
-+ checkferror_output(stderr);
- dc_show_id(stderr, stackid, " is empty\n");
- return DC_FAIL;
- }
---- a/dc/string.c
-+++ b/dc/string.c
-@@ -45,6 +45,7 @@
- #endif
- #include "dc.h"
- #include "dc-proto.h"
-+#include "number.h"
-
- /* here is the completion of the dc_string type: */
- struct dc_string {
-@@ -94,6 +95,7 @@ dc_out_str DC_DECLARG((value, discard_fl
- dc_discard discard_flag DC_DECLEND
- {
- fwrite(value->s_ptr, value->s_len, sizeof *value->s_ptr, stdout);
-+ checkferror_output(stdout);
- if (discard_flag == DC_TOSS)
- dc_free_str(&value);
- }
-@@ -169,6 +171,7 @@ dc_readstring DC_DECLARG((fp, ldelim, rd
- }
- *p++ = c;
- }
-+ checkferror_input(fp);
- return dc_makestring(line_buf, (size_t)(p-line_buf));
- }
-
---- a/h/number.h
-+++ b/h/number.h
-@@ -23,10 +23,10 @@
- You may contact the author by:
- us-mail: Philip A. Nelson
-- Computer Science Department, 9062
-- Western Washington University
-- Bellingham, WA 98226-9062
--
-+ Computer Science Department, 9062
-+ Western Washington University
-+ Bellingham, WA 98226-9062
-+
- *************************************************************************/
-
- #ifndef _NUMBER_H_
-@@ -140,4 +140,7 @@ void bc_out_num (bc_num num, int o_base,
- int leading_zero);
-
- void bc_out_long (long val, int size, int space, void (*out_char)(int));
-+
-+void checkferror_input (FILE*);
-+void checkferror_output (FILE*);
- #endif
---- a/lib/number.c
-+++ b/lib/number.c
-@@ -1713,6 +1713,7 @@ static void
- out_char (int c)
- {
- putchar(c);
-+ checkferror_output(stdout);
- }
-
-
-@@ -1721,6 +1722,7 @@ pn (bc_num num)
- {
- bc_out_num (num, 10, out_char, 0);
- out_char ('\n');
-+ checkferror_output(stdout);
- }
-
-
-@@ -1732,6 +1734,28 @@ pv (char *name, unsigned char *num, int
- printf ("%s=", name);
- for (i=0; i<len; i++) printf ("%c",BCD_CHAR(num[i]));
- printf ("\n");
-+ checkferror_output(stdout);
- }
-
- #endif
-+\f
-+/* check ferror() status and if so die */
-+void
-+checkferror_input (fp)
-+ FILE *fp;
-+{
-+ if (ferror(fp)) {
-+ perror("dc: could not read input file");
-+ exit(EXIT_FAILURE);
-+ }
-+}
-+
-+void
-+checkferror_output (fp)
-+ FILE *fp;
-+{
-+ if (ferror(fp)) {
-+ perror("dc: could not write output file");
-+ exit(EXIT_FAILURE);
-+ }
-+}
+++ /dev/null
-From a543af443c5f86b24ca89a994b75b6ef4751ac66 Mon Sep 17 00:00:00 2001
-Date: Thu, 12 Sep 2019 15:12:40 -0500
-Subject: [PATCH] no gen libmath
-
-These rules are not cross-friendly so delete them. libmath has been
-generated offline and included as part of this patch as the fbc tool
-used to generate that header is assuming the cross archtecture and
-can't execute.
-
-Upstream:
-https://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-extended/bc/bc/no-gen-libmath.patch
-https://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-extended/bc/bc/libmath.h
-
-[Reformatted to GIT for 1.0.7.1 by Matt W]
----
- bc/Makefile.am | 8 --------
- bc/libmath.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 46 insertions(+), 8 deletions(-)
- create mode 100644 bc/libmath.h
-
---- a/bc/Makefile.am
-+++ b/bc/Makefile.am
-@@ -31,14 +31,6 @@ global.o: libmath.h
-
- fbcOBJ = main.o bc.o scan.o execute.o load.o storage.o util.o warranty.o
-
--libmath.h: libmath.b $(fbcOBJ) $(LIBBC)
-- echo '{0}' > libmath.h
-- $(MAKE) global.o
-- $(LINK) -o fbc $(fbcOBJ) global.o $(LIBBC) $(LIBL) $(READLINELIB) $(LIBS)
-- ./fbc -c $(srcdir)/libmath.b </dev/null >libmath.h
-- $(srcdir)/fix-libmath_h
-- rm -f ./fbc ./global.o
--
- sbcOBJ = main.o sbc.o scan.o execute.o global.o load.o storage.o util.o \
- warranty.o
- sbc.o: sbc.c
---- /dev/null
-+++ b/bc/libmath.h
-@@ -0,0 +1,46 @@
-+{"@iK20:s2:p@r",
-+"@iF1,5.6,7,8,9,10,11,12,13,14,15[l0:KA:#Z1:l0:s7:pKA:s0:pl5:C1,0:",
-+"s14:pl7:s0:pl14:RN1:l5:0<Z2:1s12:pl5:ns5:pN2:l2:s15:pK6:l15:+",
-+"K.44:l5:*+s13:pl5:cS1+s2:pN3:l5:1>Z4:l10:1+s10:pl5:K2:/s5:pl2:",
-+"1+s2:pJ3:N4:l13:s2:p1l5:+s14:pl5:s6:p1s8:pK2:s11:pN6:1B7:J5:N8:",
-+"l11:i11:pJ6:N7:l6:l5:*s6:l8:l11:*s8:/s9:pl9:0=Z9:l10:0>Z10:N11:",
-+"l10:d10:Z12:l14:l14:*s14:pJ11:N12:N10:l15:s2:pl12:Z13:1l14:/R",
-+"N13:l14:1/RN9:l14:l9:+s14:pJ8:N5:0R]@r",
-+"@iF2,5.7,9,10,11,12,13,14,15[l0:KA:#Z1:l0:s7:pKA:s0:pl5:C2,0:",
-+"s14:pl7:s0:pl14:RN1:l5:0{Z2:1K10:l2:^-1/RN2:l2:s15:pK6:l2:+s2:",
-+"pK2:s10:p0s11:pN3:l5:K2:}Z4:l10:K2:*s10:pl5:cRs5:pJ3:N4:N5:l5:",
-+"K.5:{Z6:l10:K2:*s10:pl5:cRs5:pJ5:N6:l5:1-l5:1+/s13:s14:pl13:l13:",
-+"*s12:pK3:s11:pN8:1B9:J7:N10:l11:K2:+s11:pJ8:N9:l13:l12:*s13:l11:",
-+"/s9:pl9:0=Z11:l10:l14:*s14:pl15:s2:pl14:1/RN11:l14:l9:+s14:pJ10:N7:",
-+"0R]@r",
-+"@iF3,5.7,9,11,12,13,16,14,15[l0:KA:#Z1:l0:s7:pKA:s0:pl5:C3,0:",
-+"s14:pl7:s0:pl14:RN1:l2:s15:pK1.1:l15:*K2:+s2:p1C4,0:s14:pl5:0",
-+"<Z2:1s12:pl5:ns5:pN2:0s2:pl5:l14:/K2:+K4:/s13:pl5:K4:l13:*l14:",
-+"*-s5:pl13:K2:%Z3:l5:ns5:pN3:l15:K2:+s2:pl5:s9:s14:pl5:nl5:*s16:",
-+"pK3:s11:pN5:1B6:J4:N7:l11:K2:+s11:pJ5:N6:l9:l16:l11:l11:1-*/*",
-+"s9:pl9:0=Z8:l15:s2:pl12:Z9:l14:n1/RN9:l14:1/RN8:l14:l9:+s14:p",
-+"J7:N4:0R]@r",
-+"@iF5,5.7,14,15[l0:KA:#Z1:l0:s7:pKA:s0:pl5:C5,0:s14:pl7:s0:pl14:",
-+"RN1:l2:s15:pl2:K1.2:*s2:pl5:1C4,0:K2:*+C3,0:s14:pl15:s2:pl14:",
-+"1/R0R]@r",
-+"@iF4,5.6,7,9,10,11,12,13,16,14,15[l0:KA:#Z1:l0:s7:pKA:s0:pl5:",
-+"C4,0:s14:pl7:s0:pl14:RN1:1s12:pl5:0<Z2:1ns12:pl5:ns5:pN2:l5:1",
-+"=Z3:l2:K25:{Z4:K.7853981633974483096156608:l12:/RN4:l2:K40:{Z5:",
-+"K.7853981633974483096156608458198757210492:l12:/RN5:l2:K60:{Z6:",
-+"K.785398163397448309615660845819875721049292349843776455243736",
-+":l12:/RN6:N3:l5:K.2:=Z7:l2:K25:{Z8:K.1973955598498807583700497",
-+":l12:/RN8:l2:K40:{Z9:K.1973955598498807583700497651947902934475",
-+":l12:/RN9:l2:K60:{Z10:K.197395559849880758370049765194790293447585103787852101517688",
-+":l12:/RN10:N7:l2:s15:pl5:K.2:>Z11:l15:K5:+s2:pK.2:C4,0:s6:pN11:",
-+"l15:K3:+s2:pN12:l5:K.2:>Z13:l10:1+s10:pl5:K.2:-1l5:K.2:*+/s5:",
-+"pJ12:N13:l5:s13:s14:pl5:nl5:*s16:pK3:s11:pN15:1B16:J14:N17:l11:",
-+"K2:+s11:pJ15:N16:l13:l16:*s13:l11:/s9:pl9:0=Z18:l15:s2:pl10:l6:",
-+"*l14:+l12:/RN18:l14:l9:+s14:pJ17:N14:0R]@r",
-+"@iF6,13,5.6,7,8,9,10,11,12,16,14,15[l0:KA:#Z1:l0:s7:pKA:s0:pl13:",
-+"l5:C6,00:s14:pl7:s0:pl14:RN1:l2:s15:p0s2:pl13:1/s13:pl13:0<Z2:",
-+"l13:ns13:pl13:K2:%1=Z3:1s12:pN3:N2:1s10:pK2:s11:pN5:l11:l13:{",
-+"B6:J4:N7:l11:i11:pJ5:N6:l10:l11:*s10:pJ7:N4:K1.5:l15:*s2:pl5:",
-+"l13:^K2:l13:^/l10:/s10:p1s9:s14:pl5:nl5:*K4:/s16:pK1.5:l15:*l10:",
-+"cL+l10:cS-s2:p1s11:pN9:1B10:J8:N11:l11:i11:pJ9:N10:l9:l16:*l11:",
-+"/l13:l11:+/s9:pl9:0=Z12:l15:s2:pl12:Z13:l10:nl14:*1/RN13:l10:",
-+"l14:*1/RN12:l14:l9:+s14:pJ11:N8:0R]@r",0}
projects / feed / packages.git / commitdiff